smiklosovic commented on code in PR #3248:
URL: https://github.com/apache/cassandra/pull/3248#discussion_r1561551617


##########
src/java/org/apache/cassandra/db/guardrails/Guardrails.java:
##########
@@ -600,6 +617,45 @@ public void setDropTruncateTableEnabled(boolean enabled)
     }
 
     @Override
+<<<<<<< HEAD

Review Comment:
   @Yukei7 this will probably not compile



##########
src/java/org/apache/cassandra/db/guardrails/Guardrails.java:
##########
@@ -600,6 +617,45 @@ public void setDropTruncateTableEnabled(boolean enabled)
     }
 
     @Override
+<<<<<<< HEAD
+=======
+    public boolean getBulkLoadEnabled()
+    {
+        return DEFAULT_CONFIG.getBulkLoadEnabled();
+    }
+
+    @Override
+    public void setBulkLoadEnabled(boolean enabled)
+    {
+        DEFAULT_CONFIG.setBulkLoadEnabled(enabled);
+    }
+
+    @Override
+    public boolean getDDLEnabled()
+    {
+        return DEFAULT_CONFIG.getDDLEnabled();
+    }
+
+    @Override
+    public void setDDLEnabled(boolean enabled)
+    {
+        DEFAULT_CONFIG.setDDLEnabled(enabled);
+    }
+
+    @Override
+    public boolean getDCLEnabled()
+    {
+        return DEFAULT_CONFIG.getDCLEnabled();
+    }
+
+    @Override
+    public void setDCLEnabled(boolean enabled)
+    {
+        DEFAULT_CONFIG.setDCLEnabled(enabled);
+    }
+
+    @Override
+>>>>>>> 33ca0adba8 ((C4.1) disable ddl/dcl under guardrail framework)

Review Comment:
   @Yukei7 



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to