You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2014/01/10 21:15:04 UTC
git commit: AMBARI-4265. Provide way to set http proxy for Ambari
Server (Jeff Sposetti via ncole)
Updated Branches:
refs/heads/trunk 5550a6452 -> dbb345b6a
AMBARI-4265. Provide way to set http proxy for Ambari Server (Jeff Sposetti via ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dbb345b6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dbb345b6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dbb345b6
Branch: refs/heads/trunk
Commit: dbb345b6ac29a909eebd48896379ac54997d079e
Parents: 5550a64
Author: Nate Cole <nc...@hortonworks.com>
Authored: Fri Jan 10 15:14:06 2014 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Fri Jan 10 15:14:06 2014 -0500
----------------------------------------------------------------------
ambari-server/conf/unix/ambari-env.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/dbb345b6/ambari-server/conf/unix/ambari-env.sh
----------------------------------------------------------------------
diff --git a/ambari-server/conf/unix/ambari-env.sh b/ambari-server/conf/unix/ambari-env.sh
index 6d1a595..cb6c028 100644
--- a/ambari-server/conf/unix/ambari-env.sh
+++ b/ambari-server/conf/unix/ambari-env.sh
@@ -15,4 +15,4 @@
AMBARI_PASSHPHRASE="DEV"
-export AMBARI_JVM_ARGS='-Xms512m -Xmx2048m -Djava.security.auth.login.config=/etc/ambari-server/conf/krb5JAASLogin.conf -Djava.security.krb5.conf=/etc/krb5.conf -Djavax.security.auth.useSubjectCredsOnly=false'
+export AMBARI_JVM_ARGS=$AMBARI_JVM_ARGS' -Xms512m -Xmx2048m -Djava.security.auth.login.config=/etc/ambari-server/conf/krb5JAASLogin.conf -Djava.security.krb5.conf=/etc/krb5.conf -Djavax.security.auth.useSubjectCredsOnly=false'