Merge remote-tracking branch 'origin/master'

yoonjs2 · yoonjs2 · commit 5f0a6e083fef · 2016-01-18T00:55:30.000+09:00
# Conflicts:
#	docs/interpreter/cassandra.md
diff --git a/docs/interpreter/cassandra.md b/docs/interpreter/cassandra.md
@@ -395,7 +395,6 @@ This interpreter provides 3 commands to handle prepared and bound statements:
 Example:
 
 ```
-
     @prepare[statement_name]=...
 
     @bind[statement_name]=’text’, 1223, ’2015-07-30 12:00:01’, null, true, [‘list_item1’, ’list_item2’]
@@ -419,7 +418,6 @@ there is only one instance of the interpreter for Cassandra
 Example:
 
 ```
-
     @prepare[select]=SELECT * FROM spark_demo.albums LIMIT ?
 
     @prepare[select]=SELECT * FROM spark_demo.artists LIMIT ?
