ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rle...@apache.org
Subject ambari git commit: Create branch-2.2.1 (rlevas)
Date Mon, 25 Jan 2016 14:33:47 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2.1 [created] 759f504ef


Create branch-2.2.1 (rlevas)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/759f504e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/759f504e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/759f504e

Branch: refs/heads/branch-2.2.1
Commit: 759f504ef8603c2a5adf85b4b137ae38b5305574
Parents: 5961aaa
Author: Robert Levas <rlevas@hortonworks.com>
Authored: Mon Jan 25 09:20:16 2016 -0500
Committer: Robert Levas <rlevas@hortonworks.com>
Committed: Mon Jan 25 09:33:10 2016 -0500

----------------------------------------------------------------------
 KEYS                                            | 34 ++++++++++++++++++++
 ambari-admin/pom.xml                            |  4 +--
 ambari-agent/pom.xml                            |  4 +--
 ambari-client/groovy-client/pom.xml             |  4 +--
 ambari-client/pom.xml                           |  4 +--
 ambari-client/python-client/pom.xml             |  4 +--
 ambari-metrics/ambari-metrics-assembly/pom.xml  |  4 +--
 ambari-metrics/ambari-metrics-common/pom.xml    |  2 +-
 .../ambari-metrics-flume-sink/pom.xml           |  4 +--
 .../ambari-metrics-hadoop-sink/pom.xml          |  4 +--
 .../ambari-metrics-host-monitoring/pom.xml      |  4 +--
 .../ambari-metrics-kafka-sink/pom.xml           |  4 +--
 .../ambari-metrics-storm-sink/pom.xml           |  4 +--
 .../ambari-metrics-timelineservice/pom.xml      |  6 ++--
 ambari-metrics/pom.xml                          |  2 +-
 ambari-project/pom.xml                          |  4 +--
 ambari-server/pom.xml                           |  4 +--
 ambari-shell/ambari-groovy-shell/pom.xml        |  6 ++--
 ambari-shell/ambari-python-shell/pom.xml        |  4 +--
 ambari-shell/pom.xml                            |  4 +--
 ambari-views/pom.xml                            |  4 +--
 ambari-web/pom.xml                              |  4 +--
 contrib/ambari-log4j/pom.xml                    |  2 +-
 contrib/ambari-scom/ambari-scom-server/pom.xml  |  4 +--
 contrib/ambari-scom/metrics-sink/pom.xml        |  2 +-
 contrib/ambari-scom/pom.xml                     |  2 +-
 contrib/views/capacity-scheduler/pom.xml        |  2 +-
 contrib/views/files/pom.xml                     |  2 +-
 contrib/views/hive/pom.xml                      |  4 +--
 contrib/views/jobs/pom.xml                      |  4 +--
 contrib/views/pig/pom.xml                       |  4 +--
 contrib/views/pom.xml                           |  8 ++---
 contrib/views/slider/pom.xml                    |  4 +--
 contrib/views/storm/pom.xml                     |  2 +-
 contrib/views/tez/pom.xml                       |  2 +-
 contrib/views/utils/pom.xml                     |  2 +-
 docs/pom.xml                                    |  8 ++---
 pom.xml                                         |  2 +-
 38 files changed, 101 insertions(+), 71 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/KEYS
----------------------------------------------------------------------
diff --git a/KEYS b/KEYS
index a45ed61..1c582ff 100644
--- a/KEYS
+++ b/KEYS
@@ -487,3 +487,37 @@ Ku642inSr8PomuGyuTkLTnpo/lD5etZlJb9KWGGKoat0ZNVLsVmoiuH55d405xRf
 ExGv9cmNDPgXcltrQaO9+vF6bewcfw1MdA==
 =deK2
 -----END PGP PUBLIC KEY BLOCK-----
+pub   2048R/0EF56BD9 2016-01-25 [expires: 2026-01-22]
+uid       [ultimate] Robert Levas <rlevas@apache.org>
+sub   2048R/E5E92AB1 2016-01-25 [expires: 2026-01-22]
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: GPGTools - https://gpgtools.org
+
+mQENBFamF+sBCACw0G6bDBUx3P1USIoVjPVlb6CpaInKFnQbLTeYe8GcmEE9Lbc3
+9Iu6WUP//+y+IknFt0kj2lLKa/HnY2mY8iHNnxvy+cxPGjlXzBAyzUs3ASFoupoM
+nkB0OchWQmAec8Dm4dYKEt5go+vZp5ZSqHv7Q55YmKdfAREysqYP5/Fz8IBuphqO
+ESKokQxnLrTGElPWVRVFoH1i2ApKl1XzVCF4USsef0UqjSQNMpzlZ3So10g12OyT
+1N6yck7ocG2sLImpGRfREYtA4eeNRDEJGhgtW8GfF6X1ZaqAfHCa5o15XAbHA14X
+5ajRw0FfyJX/OcsMiLyuU+rTu3L0HepsjACrABEBAAG0IFJvYmVydCBMZXZhcyA8
+cmxldmFzQGFwYWNoZS5vcmc+iQE9BBMBCgAnBQJWphfrAhsDBQkSzAMABQsJCAcD
+BRUKCQgLBRYCAwEAAh4BAheAAAoJEILtj+EO9WvZQbkIAJeaSobMl55p9ZZufp/U
+8AUVyaCr8W8acqUE/9PYQ54/kTw493fTqGye0iYXUNGiN3qjg0ab4aw8vL5pzN32
+Vs+Au9hcAqSPgFUPPee6ipcb8B8lqWkNScyX6V63ti53UQU15POCKS8vxwutF7cA
+frpuweSySiGPvs4RM5/cbSZETNMwFcEvq3Af+bAuheUCh3Nb3a0/I+otafipH72L
+XgFnKtRGW/FXeA7Kas93nntizJOdewlaRP9jqIk9XTwCIccRUClef9RIlgt9oF1v
+wUYEHzsqXLuh91QCqNH8m9/35RudeyrkBYuDaDdqdJWH4DmP3NQtgo4qokjnUNtG
+cn25AQ0EVqYX6wEIAMY+jwWDHOIEmxs8buv6hWbJ1RZcyQoB19hb3+JT3gPfst5H
+Q00Jr9mOxQBZlGzPm8nhV129HsGKTPQhN/4xq2ecr+q+qEevhLRPjzI+RoSRorO3
+60uXQjiAX8jt2iUNtzAAFlnpk8H0gTYC0Y9yuScm3F1XFTeTKCa0ubhIR0KW4FOK
+fsilulFkcN5ZxIe737UzL0qSpSSdyO9uxuCgnWvmcF83+t6pnGv/eN2/J+z8nad/
+qlr+Th2Q5XD3OZMjKl15phj/V9P/3aBn5ctgxpnEREOXhclIKgC++zS5bNFcp1gz
+7J7B1ezmUI4I/nEqR45E7NyoZ1+bbNjD2SLanqsAEQEAAYkBJQQYAQoADwUCVqYX
+6wIbDAUJEswDAAAKCRCC7Y/hDvVr2YfqCACMr7KN6W3VHiHerHDeZUJJ2XijBwwy
+wNkujrS7gk3ZRHuJAr33pps/JyKKMp+uPeCUZyYGldSfnd4/i0wf+DWf3+DmVEa/
+E0acC3N0t01mN3I94vrjheb/Zm9PK1bDWS8xPmt6WUQ9o28DK+FCmNselwwYNNHV
+2d4S3gxf/vAhgJDm1FkoExD4kDCNDycBvoFDRxxdDG9xQDAJqkIEJpZeao26+dTF
+7I15zLastr2+KjIF3EgiapqlQUndShWmFwxGLEYY1REkLJJaVsqD+joJoQN8cJhc
+JH93bd2K+dqt3ZLR5z2FNzk+oJ4kdqIdO0rRgpfV9LZaBbX7e9acLelS
+=P4K4
+-----END PGP PUBLIC KEY BLOCK-----

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/ambari-admin/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml
index c80549c..6dfeb20 100644
--- a/ambari-admin/pom.xml
+++ b/ambari-admin/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
     <relativePath>../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -27,7 +27,7 @@
   <artifactId>ambari-admin</artifactId>
   <packaging>jar</packaging>
   <name>Ambari Admin View</name>
-  <version>2.1.0.0.0</version>
+  <version>2.2.1.0.0</version>
   <description>Admin control panel</description>
   <build>
     <plugins>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/ambari-agent/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index 38f436e..b8f0407 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -19,14 +19,14 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
     <relativePath>../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-agent</artifactId>
   <packaging>pom</packaging>
-  <version>2.1.0.0.0</version>
+  <version>2.2.1.0.0</version>
   <name>Ambari Agent</name>
   <description>Ambari Agent</description>
   <properties>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/ambari-client/groovy-client/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-client/groovy-client/pom.xml b/ambari-client/groovy-client/pom.xml
index 3dbc78e..1d2c603 100644
--- a/ambari-client/groovy-client/pom.xml
+++ b/ambari-client/groovy-client/pom.xml
@@ -12,14 +12,14 @@
   <parent>
     <artifactId>ambari-client</artifactId>
     <groupId>org.apache.ambari</groupId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
     <relativePath>../../ambari-client/</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari</groupId>
   <artifactId>groovy-client</artifactId>
   <packaging>jar</packaging>
-  <version>2.1.0.0.0</version>
+  <version>2.2.1.0.0</version>
   <name>Ambari Groovy Client</name>
   <description>Ambari Groovy client</description>
   <properties>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/ambari-client/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-client/pom.xml b/ambari-client/pom.xml
index 2f8f3fc..b55bb9c 100755
--- a/ambari-client/pom.xml
+++ b/ambari-client/pom.xml
@@ -20,14 +20,14 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
     <relativePath>../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-client</artifactId>
   <packaging>pom</packaging>
-  <version>2.1.0.0.0</version>
+  <version>2.2.1.0.0</version>
   <name>Ambari Client</name>
   <description>Ambari client</description>
   <modules>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/ambari-client/python-client/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-client/python-client/pom.xml b/ambari-client/python-client/pom.xml
index 641a351..e1bb7f1 100644
--- a/ambari-client/python-client/pom.xml
+++ b/ambari-client/python-client/pom.xml
@@ -19,14 +19,14 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-client</artifactId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
     <relativePath>../../ambari-client</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari</groupId>
   <artifactId>python-client</artifactId>
   <packaging>pom</packaging>
-  <version>2.1.0.0.0</version>
+  <version>2.2.1.0.0</version>
   <name>Ambari Python Client</name>
   <description>Ambari Python client</description>
   <properties>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/ambari-metrics/ambari-metrics-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-assembly/pom.xml b/ambari-metrics/ambari-metrics-assembly/pom.xml
index 442adde..c698ab6 100644
--- a/ambari-metrics/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics/ambari-metrics-assembly/pom.xml
@@ -23,13 +23,13 @@
   <parent>
     <artifactId>ambari-metrics</artifactId>
     <groupId>org.apache.ambari</groupId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ambari-metrics-assembly</artifactId>
   <name>Ambari Metrics Assembly</name>
   <packaging>pom</packaging>
-  <version>2.1.0.0.0</version>
+  <version>2.2.1.0.0</version>
   <description>Ambari Metrics</description>
 
   <properties>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/ambari-metrics/ambari-metrics-common/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-common/pom.xml b/ambari-metrics/ambari-metrics-common/pom.xml
index 1f8702b..a3bd96f 100644
--- a/ambari-metrics/ambari-metrics-common/pom.xml
+++ b/ambari-metrics/ambari-metrics-common/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>ambari-metrics</artifactId>
     <groupId>org.apache.ambari</groupId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ambari-metrics-common</artifactId>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/ambari-metrics/ambari-metrics-flume-sink/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-flume-sink/pom.xml b/ambari-metrics/ambari-metrics-flume-sink/pom.xml
index 627eb2f..326e0af 100644
--- a/ambari-metrics/ambari-metrics-flume-sink/pom.xml
+++ b/ambari-metrics/ambari-metrics-flume-sink/pom.xml
@@ -22,11 +22,11 @@ limitations under the License.
   <parent>
     <artifactId>ambari-metrics</artifactId>
     <groupId>org.apache.ambari</groupId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ambari-metrics-flume-sink</artifactId>
-  <version>2.1.0.0.0</version>
+  <version>2.2.1.0.0</version>
   <name>Ambari Metrics Flume Sink</name>
   <packaging>jar</packaging>
   <build>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml b/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml
index 16bfa15..78fe5dc 100644
--- a/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml
+++ b/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml
@@ -22,11 +22,11 @@ limitations under the License.
   <parent>
     <artifactId>ambari-metrics</artifactId>
     <groupId>org.apache.ambari</groupId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ambari-metrics-hadoop-sink</artifactId>
-  <version>2.1.0.0.0</version>
+  <version>2.2.1.0.0</version>
   <name>Ambari Metrics Hadoop Sink</name>
   <packaging>jar</packaging>
   <properties>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/ambari-metrics/ambari-metrics-host-monitoring/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-host-monitoring/pom.xml b/ambari-metrics/ambari-metrics-host-monitoring/pom.xml
index fd06e28..a1ef152 100644
--- a/ambari-metrics/ambari-metrics-host-monitoring/pom.xml
+++ b/ambari-metrics/ambari-metrics-host-monitoring/pom.xml
@@ -22,11 +22,11 @@
   <parent>
     <artifactId>ambari-metrics</artifactId>
     <groupId>org.apache.ambari</groupId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>pom</packaging>
-  <version>2.1.0.0.0</version>
+  <version>2.2.1.0.0</version>
   <artifactId>ambari-metrics-host-monitoring</artifactId>
   <name>Ambari Metrics Monitor</name>
   <properties>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/ambari-metrics/ambari-metrics-kafka-sink/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-kafka-sink/pom.xml b/ambari-metrics/ambari-metrics-kafka-sink/pom.xml
index 755a94b..129773b 100644
--- a/ambari-metrics/ambari-metrics-kafka-sink/pom.xml
+++ b/ambari-metrics/ambari-metrics-kafka-sink/pom.xml
@@ -22,11 +22,11 @@ limitations under the License.
   <parent>
     <artifactId>ambari-metrics</artifactId>
     <groupId>org.apache.ambari</groupId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ambari-metrics-kafka-sink</artifactId>
-  <version>2.1.0.0.0</version>
+  <version>2.2.1.0.0</version>
   <name>Ambari Metrics Kafka Sink</name>
   <packaging>jar</packaging>
   <build>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/ambari-metrics/ambari-metrics-storm-sink/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-storm-sink/pom.xml b/ambari-metrics/ambari-metrics-storm-sink/pom.xml
index de97c6e..6c5bb38 100644
--- a/ambari-metrics/ambari-metrics-storm-sink/pom.xml
+++ b/ambari-metrics/ambari-metrics-storm-sink/pom.xml
@@ -22,11 +22,11 @@ limitations under the License.
   <parent>
     <artifactId>ambari-metrics</artifactId>
     <groupId>org.apache.ambari</groupId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ambari-metrics-storm-sink</artifactId>
-  <version>2.1.0.0.0</version>
+  <version>2.2.1.0.0</version>
   <name>Ambari Metrics Storm Sink</name>
   <packaging>jar</packaging>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/ambari-metrics/ambari-metrics-timelineservice/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-timelineservice/pom.xml b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
index b934efb..0978d7f 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/pom.xml
+++ b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
@@ -22,11 +22,11 @@
   <parent>
     <artifactId>ambari-metrics</artifactId>
     <groupId>org.apache.ambari</groupId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ambari-metrics-timelineservice</artifactId>
-  <version>2.1.0.0.0</version>
+  <version>2.2.1.0.0</version>
   <name>Ambari Metrics Collector</name>
   <packaging>jar</packaging>
 
@@ -253,7 +253,7 @@
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>ambari-metrics-common</artifactId>
-      <version>2.1.0.0.0</version>
+      <version>2.2.1.0.0</version>
     </dependency>
 
     <dependency>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/ambari-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index 54ab3fe..2cf7942 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -19,7 +19,7 @@
   <groupId>org.apache.ambari</groupId>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ambari-metrics</artifactId>
-  <version>2.1.0.0.0</version>
+  <version>2.2.1.0.0</version>
   <packaging>pom</packaging>
   <modules>
     <module>ambari-metrics-common</module>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/ambari-project/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index 4d0b3af..5500f7c 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -18,11 +18,11 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari</artifactId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
   </parent>
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-project</artifactId>
-  <version>2.1.0.0.0</version>
+  <version>2.2.1.0.0</version>
   <description>Apache Ambari Project POM</description>
   <name>Apache Ambari Project POM</name>
   <packaging>pom</packaging>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index fc57ebd..573d249 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
     <relativePath>../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
   <artifactId>ambari-server</artifactId>
   <packaging>${packagingFormat}</packaging>
   <name>Ambari Server</name>
-  <version>2.1.0.0.0</version>
+  <version>2.2.1.0.0</version>
   <description>Ambari Server</description>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/ambari-shell/ambari-groovy-shell/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-shell/ambari-groovy-shell/pom.xml b/ambari-shell/ambari-groovy-shell/pom.xml
index 541f8d5..39aae36 100644
--- a/ambari-shell/ambari-groovy-shell/pom.xml
+++ b/ambari-shell/ambari-groovy-shell/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-shell</artifactId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
     <relativePath>../../ambari-shell</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
   <artifactId>ambari-groovy-shell</artifactId>
   <packaging>jar</packaging>
   <name>Ambari Groovy Shell</name>
-  <version>2.1.0.0.0</version>
+  <version>2.2.1.0.0</version>
   <description>Ambari Groovy Shell</description>
    <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>groovy-client</artifactId>
-      <version>2.1.0.0.0</version>
+      <version>2.2.1.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/ambari-shell/ambari-python-shell/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-shell/ambari-python-shell/pom.xml b/ambari-shell/ambari-python-shell/pom.xml
index 8b93668..d542a50 100644
--- a/ambari-shell/ambari-python-shell/pom.xml
+++ b/ambari-shell/ambari-python-shell/pom.xml
@@ -19,14 +19,14 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-shell</artifactId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
     <relativePath>../../ambari-shell</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-python-shell</artifactId>
   <packaging>pom</packaging>
-  <version>2.1.0.0.0</version>
+  <version>2.2.1.0.0</version>
   <name>Ambari Python Shell</name>
   <description>Ambari Python Shell</description>
   <properties>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/ambari-shell/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-shell/pom.xml b/ambari-shell/pom.xml
index 64eb73c..eba6588 100644
--- a/ambari-shell/pom.xml
+++ b/ambari-shell/pom.xml
@@ -21,14 +21,14 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
     <relativePath>../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-shell</artifactId>
   <packaging>pom</packaging>
-  <version>2.1.0.0.0</version>
+  <version>2.2.1.0.0</version>
   <name>Ambari Shell</name>
   <description>Ambari Shell</description>
   <modules>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/ambari-views/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-views/pom.xml b/ambari-views/pom.xml
index 53d1742..54e3211 100644
--- a/ambari-views/pom.xml
+++ b/ambari-views/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.ambari</groupId>
         <artifactId>ambari-project</artifactId>
-        <version>2.1.0.0.0</version>
+        <version>2.2.1.0.0</version>
         <relativePath>../ambari-project</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -28,7 +28,7 @@
     <artifactId>ambari-views</artifactId>
     <packaging>jar</packaging>
     <name>Ambari Views</name>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
     <description>Ambari View interfaces.</description>
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/ambari-web/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-web/pom.xml b/ambari-web/pom.xml
index 21c10b7..4d48900 100644
--- a/ambari-web/pom.xml
+++ b/ambari-web/pom.xml
@@ -20,14 +20,14 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
     <relativePath>../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ambari-web</artifactId>
   <packaging>pom</packaging>
   <name>Ambari Web</name>
-  <version>2.1.0.0.0</version>
+  <version>2.2.1.0.0</version>
   <description>Ambari Web</description>
   <properties>
     <ambari.dir>${project.parent.parent.basedir}</ambari.dir>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/contrib/ambari-log4j/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/ambari-log4j/pom.xml b/contrib/ambari-log4j/pom.xml
index 292309c..f476121 100644
--- a/contrib/ambari-log4j/pom.xml
+++ b/contrib/ambari-log4j/pom.xml
@@ -20,7 +20,7 @@
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-log4j</artifactId>
   <packaging>jar</packaging>
-  <version>2.1.0.0</version>
+  <version>2.2.1.0.0</version>
   <name>ambari-log4j</name>
   <url>http://maven.apache.org</url>
   <repositories>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/contrib/ambari-scom/ambari-scom-server/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/ambari-scom-server/pom.xml b/contrib/ambari-scom/ambari-scom-server/pom.xml
index 89e237b..2aa295c 100644
--- a/contrib/ambari-scom/ambari-scom-server/pom.xml
+++ b/contrib/ambari-scom/ambari-scom-server/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.ambari</groupId>
         <artifactId>ambari-scom-project</artifactId>
-        <version>2.1.0.0</version>
+        <version>2.2.1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ambari-scom-server</artifactId>
@@ -27,7 +27,7 @@
     <name>Ambari SCOM Server</name>
     <url>http://maven.apache.org</url>
     <properties>
-        <ambari.version>2.1.0-SNAPSHOT</ambari.version>
+        <ambari.version>2.2.1-SNAPSHOT</ambari.version>
         <powermock.version>1.5.4</powermock.version>
     </properties>
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/contrib/ambari-scom/metrics-sink/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/metrics-sink/pom.xml b/contrib/ambari-scom/metrics-sink/pom.xml
index 0001bc1..2d49689 100644
--- a/contrib/ambari-scom/metrics-sink/pom.xml
+++ b/contrib/ambari-scom/metrics-sink/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.ambari</groupId>
         <artifactId>ambari-scom-project</artifactId>
-        <version>2.1.0.0</version>
+        <version>2.2.1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>metrics-sink</artifactId>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/contrib/ambari-scom/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/pom.xml b/contrib/ambari-scom/pom.xml
index 0ed9de8..f4bb914 100644
--- a/contrib/ambari-scom/pom.xml
+++ b/contrib/ambari-scom/pom.xml
@@ -20,7 +20,7 @@
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-scom-project</artifactId>
     <packaging>pom</packaging>
-    <version>2.1.0.0</version>
+    <version>2.2.1.0.0</version>
     <name>Ambari SCOM Project</name>
     <modules>
         <module>ambari-scom-server</module>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/contrib/views/capacity-scheduler/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/capacity-scheduler/pom.xml b/contrib/views/capacity-scheduler/pom.xml
index cacd3d3..7443617 100644
--- a/contrib/views/capacity-scheduler/pom.xml
+++ b/contrib/views/capacity-scheduler/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.ambari.contrib.views</groupId>
         <artifactId>ambari-contrib-views</artifactId>
-        <version>2.1.0.0.0</version>
+        <version>2.2.1.0.0</version>
     </parent>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/contrib/views/files/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/files/pom.xml b/contrib/views/files/pom.xml
index afcd428..0574b44 100644
--- a/contrib/views/files/pom.xml
+++ b/contrib/views/files/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.ambari.contrib.views</groupId>
     <artifactId>ambari-contrib-views</artifactId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
   </parent>
 
   <dependencies>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/contrib/views/hive/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/hive/pom.xml b/contrib/views/hive/pom.xml
index 9f3f1f7..00935c7 100644
--- a/contrib/views/hive/pom.xml
+++ b/contrib/views/hive/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.ambari.contrib.views</groupId>
     <artifactId>ambari-contrib-views</artifactId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
   </parent>
 
   <dependencies>
@@ -226,7 +226,7 @@
   <properties>
     <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
     <hive-version>1.0.0</hive-version>
-    <ambari.version>2.1.0.0.0</ambari.version>
+    <ambari.version>2.2.1.0.0</ambari.version>
   </properties>
   <build>
     <plugins>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/contrib/views/jobs/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/jobs/pom.xml b/contrib/views/jobs/pom.xml
index d797ebd..16a93dc 100644
--- a/contrib/views/jobs/pom.xml
+++ b/contrib/views/jobs/pom.xml
@@ -19,14 +19,14 @@
     <parent>
         <groupId>org.apache.ambari.contrib.views</groupId>
         <artifactId>ambari-contrib-views</artifactId>
-        <version>2.1.0.0.0</version>
+        <version>2.2.1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.ambari.contrib.views</groupId>
     <artifactId>jobs</artifactId>
     <packaging>jar</packaging>
     <name>Jobs</name>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
     <description>Jobs View</description>
     <properties>
       <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/contrib/views/pig/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/pig/pom.xml b/contrib/views/pig/pom.xml
index fe5fcdf..216ecff 100644
--- a/contrib/views/pig/pom.xml
+++ b/contrib/views/pig/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.ambari.contrib.views</groupId>
     <artifactId>ambari-contrib-views</artifactId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
   </parent>
 
   <dependencies>
@@ -144,7 +144,7 @@
 
   <properties>
     <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
-    <ambari.version>2.1.0.0.0</ambari.version>
+    <ambari.version>2.2.1.0.0</ambari.version>
     <ui.directory>${basedir}/src/main/resources/ui/pig-web</ui.directory>
   </properties>
   <build>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/contrib/views/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/pom.xml b/contrib/views/pom.xml
index 32ea74f..fff4a08 100644
--- a/contrib/views/pom.xml
+++ b/contrib/views/pom.xml
@@ -19,17 +19,17 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
     <relativePath>../../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari.contrib.views</groupId>
   <artifactId>ambari-contrib-views</artifactId>
   <packaging>pom</packaging>
-  <version>2.1.0.0.0</version>
+  <version>2.2.1.0.0</version>
   <name>Ambari Contrib Views</name>
   <properties>
-    <ambari.version>2.1.0.0.0</ambari.version>
+    <ambari.version>2.2.1.0.0</ambari.version>
     <ambari.dir>${project.parent.parent.basedir}</ambari.dir>
     <hadoop.version>2.7.1</hadoop.version>
   </properties>
@@ -192,7 +192,7 @@
       <dependency>
         <groupId>org.apache.ambari</groupId>
         <artifactId>ambari-views</artifactId>
-        <version>2.1.0.0.0</version>
+        <version>2.2.1.0.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/contrib/views/slider/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/slider/pom.xml b/contrib/views/slider/pom.xml
index f66d71a..705f3cf 100644
--- a/contrib/views/slider/pom.xml
+++ b/contrib/views/slider/pom.xml
@@ -13,13 +13,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari.contrib.views</groupId>
   <artifactId>slider</artifactId>
-  <version>2.1.0.0.0</version>
+  <version>2.2.1.0.0</version>
   <name>Slider</name>
 
   <parent>
     <groupId>org.apache.ambari.contrib.views</groupId>
     <artifactId>ambari-contrib-views</artifactId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
   </parent>
 
   <dependencies>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/contrib/views/storm/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/storm/pom.xml b/contrib/views/storm/pom.xml
index d7bf1a7..8ae9aa0 100644
--- a/contrib/views/storm/pom.xml
+++ b/contrib/views/storm/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.ambari.contrib.views</groupId>
     <artifactId>ambari-contrib-views</artifactId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
   </parent>
   <properties>
     <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/contrib/views/tez/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/tez/pom.xml b/contrib/views/tez/pom.xml
index 450cf9f..35d057a 100644
--- a/contrib/views/tez/pom.xml
+++ b/contrib/views/tez/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.ambari.contrib.views</groupId>
     <artifactId>ambari-contrib-views</artifactId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
   </parent>
   <properties>
     <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/contrib/views/utils/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/utils/pom.xml b/contrib/views/utils/pom.xml
index 89ecc68..6eb2931 100644
--- a/contrib/views/utils/pom.xml
+++ b/contrib/views/utils/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.ambari.contrib.views</groupId>
     <artifactId>ambari-contrib-views</artifactId>
-    <version>2.1.0.0.0</version>
+    <version>2.2.1.0.0</version>
   </parent>
 
   <dependencies>

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/docs/pom.xml
----------------------------------------------------------------------
diff --git a/docs/pom.xml b/docs/pom.xml
index feb9393..f1298f0 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -28,7 +28,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.apache.ambari</groupId>
-    <version>2.2.0</version>
+    <version>2.2.1</version>
     <artifactId>ambari</artifactId>
     <packaging>pom</packaging>
 
@@ -42,11 +42,7 @@
         <package.pid.dir>/var/run/ambari</package.pid.dir>
         <package.release>1</package.release>
         <package.type>tar.gz</package.type>
-<<<<<<< HEAD
-        <ambari.version>2.1.0</ambari.version>
-=======
-        <ambari.version>2.2.0</ambari.version>
->>>>>>> 5c6c719... Update ambari docs for ambari 2.2.0 release. (Jaimin)
+        <ambari.version>2.2.1</ambari.version>
         <final.name>${project.artifactId}-${ambari.version}</final.name>
     </properties>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/759f504e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d1eba14..69148bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   <artifactId>ambari</artifactId>
   <packaging>pom</packaging>
   <name>Ambari Main</name>
-  <version>2.1.0.0.0</version>
+  <version>2.2.1.0.0</version>
   <description>Ambari</description>
   <url>http://ambari.apache.org/</url>
   <scm>


Mime
View raw message