tree 3836a79d53e7ab607d6c0b89ccd6cc8eefe30cb7
parent 08be74de678930e6823f9fe7e460c35bb58040f9
parent 51c4d0d3184dfb5f2601367f06a46459126f377d
author Vitaly Buka <vitalybuka@google.com> 1454546248 -0800
committer Vitaly Buka <vitalybuka@google.com> 1454546966 -0800

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

* weave/master:
  Revert "Make internal googletest optional."
  Fix incorrect weave setting file path
  Make internal googletest optional.
  Make internal libevhtp optional.
  Periodicly clean up command queue and remove old processed commands
  Changed meaning of some SSID flags
  Rename CommandQueue::DelayedRemove into RemoveLater()
  Fix memory leak when removing CommandInstance from CommandQueue
  Add a unit tests for deleting CloudCommandProxy along with CommandInstance
  Add libevent-dev to README.
  Make default Makefile target "all".
  Replace bleeding-edge libevent with libevhtp.
  Remove crypto type "None"
  Merge: Add write callback into SaveSettings function
  Merge: Add |name| into LoadSettings/SaveSettings

Change-Id: Ia20fbfd59ee3b6287380b6e674b03f038d1b88b3