Merge branch 'main' into object-create

snowflakedb · Jun 13, 2024 · 5a61f70 · 5a61f70
2 parents 318ff7e + e8f626d
commit 5a61f70
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -21,6 +21,15 @@
 
 ## New additions
 * Add `snow object create` command
+
+## Fixes and improvements
+
+# v2.5.0
+## Backward incompatibility
+
+## Deprecations
+
+## New additions
 * Added `snow app bundle` command that prepares a local folder in the project directory with artifacts to be uploaded to a stage as part of creating a Snowflake Native App.
   * Snowflake Native App projects can now optionally generate CREATE FUNCTION or CREATE PROCEDURE declarations in setup scripts from Snowpark python code that includes decorators (e.g. @sproc, @udf).
 * Added `snow app validate` command that validates the setup script SQL used to create a Snowflake Native App for syntax validity, invalid object references, and best practices
@@ -50,7 +59,6 @@
 ## Deprecations
 
 ## New additions
->>>>>>> main
 * Added the `--cascade` option to `snow app teardown` command that drops all application objects owned by the application.
  * Add external access integration to snow object commands
  * Add aliases for `snow object list/describe/drop` commands under:

diff --git a/src/snowflake/cli/__about__.py b/src/snowflake/cli/__about__.py
@@ -14,4 +14,4 @@
 
 from __future__ import annotations
 
-VERSION = "2.5.0.dev0"
+VERSION = "2.6.0.dev0"