The meaning of life is to explore the world

Merged MongoDB branch into master

Posted on By Jason Liu

What have been done:

  1. Released logging features to production.
  2. Merge MongoDB branch with master into production.

Note:
Procedure of merging:

  1. git checkout master
  2. git pull origin master
  3. git pull origin add_mongodb
  4. Fix the conflicts in Eclipse IDE
  5. git add "files after conflicts resolved"
  6. git commit -m "Resolved merging conflicts"
  7. git push origin master