tree 85d3ff7f20bf5ee31098cb4700051d01d1e01b07
parent 888be474c0100cc1a7229aadfb2dc234dcc83f7f
parent f39588237a217ebd74c4424d5f379b78f6eb09d0
author Zhenkai Zhu <zhuzhenkai@gmail.com> 1360106497 +0000
committer Gerrit Code Review <gerrit@Git.irl.CS.UCLA.EDU> 1360106497 +0000

Merge changes Id564ca35,I6082a335,I54210671

* changes:
  Printing error when file is requested to be assembled, but something is wrong with assembly
  Delaying saving of the local state change from dispatcher (useful when many changes happen at about the same time)
  ccnx: Update tracing in ccnx-wrapper