tree d20515355cc7906906d444b949e554068b80b993
parent e851e48e0f6e71af1ed25c982aae51cac0004f28
parent 70712809e243dc768bef4f9f294ad1bf94f3b607
author Vitaly Buka <vitalybuka@google.com> 1454715549 -0800
committer Vitaly Buka <vitalybuka@google.com> 1454715549 -0800

Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'

7071280 Fix some libevhtp usage details.
5616013 Merge remote-tracking branch 'weave/dev' into 'weave/master'
c93476e libevhtp requires libevent-dev
3b8fbc5 Add customizable settings option for xmpp_endpoint
15888c7 cmake is used to build gtest and libevhtp
ff46c93 Merge remote-tracking branch 'weave/master' into dev_review
08be74d Update libuweave/macaroon code
51c4d0d Revert "Make internal googletest optional."
dcf2bde Fix incorrect weave setting file path
60b131c Make internal googletest optional.
ddb8759 Make internal libevhtp optional.
4efdf46 Fix GCC warning
4fe71e3 Make App ID a part of User ID
3cbb686 Update macaroon lib with version supporting empty strings
8585d30 Remove unused line
69dd2e1 Merge remote-tracking branch 'weave/master' into dev_dev
70c8642 Add kUwMacaroonDelegateeTypeService caveat
d5f7aab Add session ID validation
d7c6deb Remove crypto type "None"
d74a732 Update macaroon lib
a821f2e Integrate new macaroon library
7d29a5a Update macaroon lib
1c83377 Fix build errors introduced by
9ac4c6c Merge remote-tracking branch 'weave/master' into 'weave/dev'
5a7c4f5 Add black list manager implementation
484b6e4 Update AccessBlackListManager interface
81ac16e Add MockConfigStore argument to disabled default expectations
07bb755 Merge remote-tracking branch 'weave/master' into dev_dev2
7329b74 Fix unittest compilation on GCC
f533677 Implemented _accessControlBlackList trait
6741755 Merge remote-tracking branch 'weave/master' into dev_dev2
42e508f Add write callback into SaveSettings function
7ecdf95 Add |name| into LoadSettings/SaveSettings
8023b80 Merge remote-tracking branch 'weave/master' into dev_dev2