tree 9946dd25ed37a6e57e73ed409f8cf978012f3613
parent 22d348385e79942b9a80c296cb3b6434bfb94e1d
parent fd415cbae66dac326bdcbbfba74f408d9d1109bd
author Eldon Carman <ecarm002@ucr.edu> 1391795653 -0800
committer Eldon Carman <ecarm002@ucr.edu> 1391795653 -0800

Merge branch 'master' into ecarm002/aggregate_sql_functions

* master:
  fix for issue 712
  Fixed a typo in the merge policy parameters.