ambari git commit: AMBARI-13717. Couldn`t start the most of services after upgrade from 2.1.2 to 2.1.3.0 (Debian7) (aonishuk)

2015-11-04 Thread aonishuk 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 409ea0131 -> b90a7e33c


AMBARI-13717. Couldn`t start the most of services after upgrade from 2.1.2 to 
2.1.3.0 (Debian7) (aonishuk)


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

Branch: refs/heads/branch-2.1
Commit: b90a7e33c74c86d7263cc6059f466378fb2f6329
Parents: 409ea01
Author: Andrew Onishuk 
Authored: Wed Nov 4 21:52:54 2015 +0200
Committer: Andrew Onishuk 
Committed: Wed Nov 4 21:52:54 2015 +0200

--
 .../java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b90a7e33/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
index 5d1e934..09979f2 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
@@ -100,7 +100,7 @@ public class UpgradeCatalog213 extends 
AbstractUpgradeCatalog {
 "if [ \"$command\" == \"datanode\" ] && [ 
\"$EUID\" -eq 0 ] && [ -n \"$HADOOP_SECURE_DN_USER\" ]; then\n" +
 "  ulimit -l 
{{datanode_max_locked_memory}}\n" +
 "fi\n" +
-"{% endif %};\n";
+"{% endif %}\n";
 
   private static final String DOWNGRADE_ALLOWED_COLUMN = "downgrade_allowed";
   private static final String UPGRADE_SKIP_FAILURE_COLUMN = "skip_failures";

ambari git commit: AMBARI-13717. Couldn`t start the most of services after upgrade from 2.1.2 to 2.1.3.0 (Debian7) (aonishuk)

2015-11-04 Thread aonishuk 
Repository: ambari
Updated Branches:
  refs/heads/trunk 03a7b9d0e -> b841e95c4


AMBARI-13717. Couldn`t start the most of services after upgrade from 2.1.2 to 
2.1.3.0 (Debian7) (aonishuk)


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

Branch: refs/heads/trunk
Commit: b841e95c4b9b656101b659efa5493fd3154208ae
Parents: 03a7b9d
Author: Andrew Onishuk 
Authored: Wed Nov 4 21:51:39 2015 +0200
Committer: Andrew Onishuk 
Committed: Wed Nov 4 21:51:39 2015 +0200

--
 .../java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b841e95c/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
index 743273f..c72809c 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
@@ -100,7 +100,7 @@ public class UpgradeCatalog213 extends 
AbstractUpgradeCatalog {
 "if [ \"$command\" == \"datanode\" ] && [ \"$EUID\" -eq 0 ] && [ -n 
\"$HADOOP_SECURE_DN_USER\" ]; then\n" +
 "  ulimit -l {{datanode_max_locked_memory}}\n" +
 "fi\n" +
-"{% endif %};\n";
+"{% endif %}\n";
 
   private static final String DOWNGRADE_ALLOWED_COLUMN = "downgrade_allowed";
   private static final String UPGRADE_SKIP_FAILURE_COLUMN = "skip_failures";