Repository: incubator-atlas
Updated Branches:
  refs/heads/master 2f195e7f2 -> b856269e9


ATLAS-1173 Doc: Minor editorial bug in the example given for property 
atlas.server.ha.zookeeper.auth (yhemanth via shwethags)


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

Branch: refs/heads/master
Commit: b856269e98f6e094f2bea775afb97ad2c4d9d9c7
Parents: 2f195e7
Author: Shwetha GS <sshivalingamur...@hortonworks.com>
Authored: Thu Sep 15 11:55:47 2016 +0530
Committer: Shwetha GS <sshivalingamur...@hortonworks.com>
Committed: Thu Sep 15 11:55:47 2016 +0530

----------------------------------------------------------------------
 docs/src/site/twiki/Configuration.twiki | 2 +-
 release-log.txt                         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/b856269e/docs/src/site/twiki/Configuration.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/Configuration.twiki 
b/docs/src/site/twiki/Configuration.twiki
index 2e077d3..bbe56d2 100644
--- a/docs/src/site/twiki/Configuration.twiki
+++ b/docs/src/site/twiki/Configuration.twiki
@@ -236,7 +236,7 @@ atlas.server.ha.zookeeper.session.timeout.ms=20000
 # Specify the scheme and the identity to be used for setting up ACLs on nodes 
created in Zookeeper for HA.
 # The format of these options is <scheme>:<identity>. For more information 
refer to 
http://zookeeper.apache.org/doc/r3.2.2/zookeeperProgrammers.html#sc_ZooKeeperAccessControl.
 # The 'acl' option allows to specify a scheme, identity pair to setup an ACL 
for.
-atlas.server.ha.zookeeper.acl=auth:sasl:cli...@comany.com
+atlas.server.ha.zookeeper.acl=sasl:cli...@comany.com
 # The 'auth' option specifies the authentication that should be used for 
connecting to Zookeeper.
 atlas.server.ha.zookeeper.auth=sasl:cli...@company.com
 

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/b856269e/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index ac8db43..f043a33 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -9,6 +9,7 @@ ATLAS-1060 Add composite indexes for exact match performance 
improvements for al
 ATLAS-1127 Modify creation and modification timestamps to Date instead of 
Long(sumasai)
 
 ALL CHANGES:
+ATLAS-1173 Doc: Minor editorial bug in the example given for property 
atlas.server.ha.zookeeper.auth (yhemanth via shwethags)
 ATLAS-1133 Jetty Server start doesn't throw exception when 
user-credential.properties file is not found (nixonrodrigues,svimal2106 via 
kevalbhatt)
 ATLAS-1149 Changes to UI to sort the hive table schema based on "position" 
attribute of hive_column (Kalyanikashikar via kevalbhatt)
 ATLAS-1162 Register shutdown hooks with Hadoop's ShutdownHookManager, instead 
of directly with Java Runtime (mneethiraj via sumasai)

Reply via email to