You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ma...@apache.org on 2016/12/23 01:47:06 UTC

[37/50] [abbrv] incubator-atlas git commit: ATLAS-1173 Doc: Minor editorial bug in the example given for property atlas.server.ha.zookeeper.auth (yhemanth via shwethags)

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

(cherry picked from commit b856269e98f6e094f2bea775afb97ad2c4d9d9c7)


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

Branch: refs/heads/0.7-incubating
Commit: dc888328a633978a3ddd0ad57dd185fcac85e1a0
Parents: 4bcef62
Author: Shwetha GS <ss...@hortonworks.com>
Authored: Thu Sep 15 11:55:47 2016 +0530
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Thu Dec 22 15:31:24 2016 -0800

----------------------------------------------------------------------
 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/dc888328/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:client@comany.com
+atlas.server.ha.zookeeper.acl=sasl:client@comany.com
 # The 'auth' option specifies the authentication that should be used for connecting to Zookeeper.
 atlas.server.ha.zookeeper.auth=sasl:client@company.com
 

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/dc888328/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index dc4013c..3d3b829 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -30,6 +30,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset
 ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags)
 
 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)