You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2018/12/31 21:42:47 UTC
[geode-native] branch develop updated: GEODE-6240 - Add license to
ubuntu packer files (#427)
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new 706928a GEODE-6240 - Add license to ubuntu packer files (#427)
706928a is described below
commit 706928a7accadd94edfb319480b34f73297e917d
Author: M. Oleske <mo...@users.noreply.github.com>
AuthorDate: Mon Dec 31 13:42:43 2018 -0800
GEODE-6240 - Add license to ubuntu packer files (#427)
* Fix format issues
---
cppcache/include/geode/HashMapOfPools.hpp | 18 +++++++++---------
cppcache/include/geode/PoolManager.hpp | 2 +-
.../files/etc/systemd/system/update-hosts.service | 15 +++++++++++++++
packer/ubuntu/files/usr/local/bin/update-hosts.sh | 15 +++++++++++++++
4 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/cppcache/include/geode/HashMapOfPools.hpp b/cppcache/include/geode/HashMapOfPools.hpp
index 5a2354f..75cd5ab 100644
--- a/cppcache/include/geode/HashMapOfPools.hpp
+++ b/cppcache/include/geode/HashMapOfPools.hpp
@@ -17,16 +17,16 @@
#pragma once
-#include <unordered_map>
-#include <string>
#include <memory>
+#include <string>
+#include <unordered_map>
namespace apache {
- namespace geode {
- namespace client {
- class Pool;
+namespace geode {
+namespace client {
+class Pool;
- using HashMapOfPools = std::unordered_map <std::string, std::shared_ptr<Pool>>;
- }
- }
-}
+using HashMapOfPools = std::unordered_map<std::string, std::shared_ptr<Pool>>;
+} // namespace client
+} // namespace geode
+} // namespace apache
diff --git a/cppcache/include/geode/PoolManager.hpp b/cppcache/include/geode/PoolManager.hpp
index 1fb58d1..058a9bb 100644
--- a/cppcache/include/geode/PoolManager.hpp
+++ b/cppcache/include/geode/PoolManager.hpp
@@ -26,10 +26,10 @@
#include <unordered_map>
#include "Cache.hpp"
-#include "geode/HashMapOfPools.hpp"
#include "Pool.hpp"
#include "PoolFactory.hpp"
#include "Region.hpp"
+#include "geode/HashMapOfPools.hpp"
#include "internal/geode_base.hpp"
#include "internal/geode_globals.hpp"
diff --git a/packer/ubuntu/files/etc/systemd/system/update-hosts.service b/packer/ubuntu/files/etc/systemd/system/update-hosts.service
index 6d0117d..cd954ce 100644
--- a/packer/ubuntu/files/etc/systemd/system/update-hosts.service
+++ b/packer/ubuntu/files/etc/systemd/system/update-hosts.service
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
[Unit]
Description=Ensure an A record exists for local hostname in /etc/hosts
After=network.target
diff --git a/packer/ubuntu/files/usr/local/bin/update-hosts.sh b/packer/ubuntu/files/usr/local/bin/update-hosts.sh
index 7971a92..43921de 100644
--- a/packer/ubuntu/files/usr/local/bin/update-hosts.sh
+++ b/packer/ubuntu/files/usr/local/bin/update-hosts.sh
@@ -1,5 +1,20 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
# add hostname to /etc/hosts if not set
if (! getent hosts `hostname` >/dev/null); then
echo `hostname -I` `hostname` >> /etc/hosts