Skip to content

CP-13509 Sync develop from master as the commit history is broken - #688

Closed
SumoSourabh wants to merge 43 commits into
delphix:developfrom
SumoSourabh:syncmaster
Closed

CP-13509 Sync develop from master as the commit history is broken#688
SumoSourabh wants to merge 43 commits into
delphix:developfrom
SumoSourabh:syncmaster

Conversation

@SumoSourabh

@SumoSourabh SumoSourabh commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

Moving all commits from master to develop as with a previous merge PR I did a rebase and merge which broke the commit history. Need to correct that

fdrozdowski and others added 30 commits May 6, 2020 10:05
* DOC-1074 Document password vault support for VSDK plugins (delphix#347)

* Correct Typo in Example, it should be UNIX not WINDOWS (delphix#360)

* Add documentation for gRPC message and memory limits delphix#390 (delphix#391)

* Fix version number in doc header (delphix#358) (delphix#397)

* Update Delphix Engine version required to 6.0.7.0. (delphix#386) (delphix#398)

* Update SDK Docs deployment to use a deploy_key (delphix#392) (delphix#399)

* CP-6005 Ensure vSDK test coverage (delphix#403)

* CP-6006 Futurize vSDK - Stage 1 (delphix#404)

* Add support for virtualCleanup decorator (delphix#400) (delphix#405)

Co-authored-by: Kurt Hutchison <kurth.hutchison@delphix.com>

* Fixes delphix#401 Networking capabilities should be documented (delphix#402)

Fixes delphix#401 Networking capabilities should be documented

* CP-6009 Add to_str and to_byte helpers (delphix#407)

* CP-6621 bump sdk version to 4.0.0 (delphix#409)

* CP-6694 Update docs for SDK 4.0.0 (delphix#410)

* CP-7022 vSDK 4.0.0 release tasks

* Update VirtualDelete flow diagram to include the virtual.cleanup call. (delphix#414)

Co-authored-by: Kurt Hutchison <kurth.hutchison@delphix.com>

* Update documentation with new gRPC message limits (delphix#415)

Co-authored-by: Raul Santelices <rasantel@users.noreply.github.com>
Co-authored-by: Ranzo J Taylor, III <36489926+Ranzo3@users.noreply.github.com>
Co-authored-by: Jeff Ngo <35587243+jeffngo@users.noreply.github.com>
Co-authored-by: Ankur <ankursarin@gmail.com>
Co-authored-by: kurthdelphix <89274759+kurthdelphix@users.noreply.github.com>
Co-authored-by: Kurt Hutchison <kurth.hutchison@delphix.com>
Co-authored-by: Tom Walsh <61519496+mothslaw@users.noreply.github.com>
manual merge of release into master
# Conflicts:
#	.bumpversion.cfg
#	.github/workflows/pre-commit.yml
#	common/src/main/python/dlpx/virtualization/common/VERSION
#	docs/docs/Getting_Started.md
#	docs/docs/References/Version_Compatibility.md
#	dvp/src/main/python/dlpx/virtualization/VERSION
#	libs/src/main/python/dlpx/virtualization/libs/VERSION
#	libs/src/main/python/dlpx/virtualization/libs/libs.py
#	platform/src/main/python/dlpx/virtualization/platform/VERSION
#	tools/src/main/python/dlpx/virtualization/_internal/VERSION
#	tools/src/main/python/dlpx/virtualization/_internal/codegen/templates/base_model_.mustache
#	tools/src/test/python/dlpx/virtualization/_internal/commands/test_build.py
#	tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py
Sync release (develop - from local dev) branch with Master
Updating code owners

Co-authored-by: Sourabh Jain <sourabh.jain@delphix.com>
* __hash__ is needed in python 3

* DLPX-79760 SnapshotDefinitionDataPaths object is not hashable since py2-3 transition

* DOC-2234 Update new logo in developer.delphix.com

* Resolved COnflicts

* revert logo chnages

* revert logo chnages

* Resolve Conflicts

* revert changes

* revert logo.png

* Resolve Conflicts

* DOC-2234 Update new logo in developer.delphix.com

* logo chnages

* DOC-2234 Update new logo in developer.delphix.com

* new favicon

* incorporated review comments

* DLPX-81195 develop version of vSDK needs to be bumped up to 4.0.4 for testing to use latest vSDK code

* DLPX-81195 develop version of vSDK needs to be bumped up to 4.0.4 for testing to use latest vSDK code

* Changes suggested by Aleks

* CP-8174 VSDK Changes to support source sizing decorators

* reverted dvp version related changes

* reverted extra comma

* update engine API version

* Fixed Formatting Issues

* Fixed Formatting Issues

* Fixed Unit Tests

* Fixed Unit Tests
…ranch before updating github actions (delphix#442)

* __hash__ is needed in python 3

* DLPX-79760 SnapshotDefinitionDataPaths object is not hashable since py2-3 transition

* DOC-2234 Update new logo in developer.delphix.com

* Resolved COnflicts

* revert logo chnages

* revert logo chnages

* Resolve Conflicts

* revert changes

* revert logo.png

* Resolve Conflicts

* DOC-2234 Update new logo in developer.delphix.com

* logo chnages

* DOC-2234 Update new logo in developer.delphix.com

* new favicon

* incorporated review comments

* DLPX-81195 develop version of vSDK needs to be bumped up to 4.0.4 for testing to use latest vSDK code

* DLPX-81195 develop version of vSDK needs to be bumped up to 4.0.4 for testing to use latest vSDK code

* Changes suggested by Aleks

* CP-8174 VSDK Changes to support source sizing decorators

* reverted dvp version related changes

* reverted extra comma

* update engine API version

* Fixed Formatting Issues

* Fixed Formatting Issues

* Fixed Unit Tests

* Fixed Unit Tests

* Bumping up dvp-api, vsdk

* uppdate formatting
…evelop branch before updating github actions (delphix#442)" (delphix#443)

This reverts commit 222517e.
…ranch before updating github actions (delphix#444)

* __hash__ is needed in python 3

* DLPX-79760 SnapshotDefinitionDataPaths object is not hashable since py2-3 transition

* DOC-2234 Update new logo in developer.delphix.com

* Resolved COnflicts

* revert logo chnages

* revert logo chnages

* Resolve Conflicts

* revert changes

* revert logo.png

* Resolve Conflicts

* DOC-2234 Update new logo in developer.delphix.com

* logo chnages

* DOC-2234 Update new logo in developer.delphix.com

* new favicon

* incorporated review comments

* DLPX-81195 develop version of vSDK needs to be bumped up to 4.0.4 for testing to use latest vSDK code

* DLPX-81195 develop version of vSDK needs to be bumped up to 4.0.4 for testing to use latest vSDK code

* Changes suggested by Aleks

* CP-8174 VSDK Changes to support source sizing decorators

* reverted dvp version related changes

* reverted extra comma

* update engine API version

* Fixed Formatting Issues

* Fixed Formatting Issues

* Fixed Unit Tests

* Fixed Unit Tests

* Bumping up dvp-api, vsdk

* uppdate formatting

* for rerun the failed runs

* bumpversion support dev bumping

* revert bumpversion support dev bumping

* bump up version from dev0 to dev1

* bump up version from dev0 to dev1
* Updating code owners for the github repository (delphix#439)

Updating code owners

Co-authored-by: Sourabh Jain <sourabh.jain@delphix.com>

* Create CodeOwners File [Terraform]

* CP-8174 VSDK Changes to support source sizing decorators (delphix#441)

* __hash__ is needed in python 3

* DLPX-79760 SnapshotDefinitionDataPaths object is not hashable since py2-3 transition

* DOC-2234 Update new logo in developer.delphix.com

* Resolved COnflicts

* revert logo chnages

* revert logo chnages

* Resolve Conflicts

* revert changes

* revert logo.png

* Resolve Conflicts

* DOC-2234 Update new logo in developer.delphix.com

* logo chnages

* DOC-2234 Update new logo in developer.delphix.com

* new favicon

* incorporated review comments

* DLPX-81195 develop version of vSDK needs to be bumped up to 4.0.4 for testing to use latest vSDK code

* DLPX-81195 develop version of vSDK needs to be bumped up to 4.0.4 for testing to use latest vSDK code

* Changes suggested by Aleks

* CP-8174 VSDK Changes to support source sizing decorators

* reverted dvp version related changes

* reverted extra comma

* update engine API version

* Fixed Formatting Issues

* Fixed Formatting Issues

* Fixed Unit Tests

* Fixed Unit Tests

* CP-8293 Update version to 4.0.5.dev0 for virtualization-sdk develop branch before updating github actions (delphix#442)

* __hash__ is needed in python 3

* DLPX-79760 SnapshotDefinitionDataPaths object is not hashable since py2-3 transition

* DOC-2234 Update new logo in developer.delphix.com

* Resolved COnflicts

* revert logo chnages

* revert logo chnages

* Resolve Conflicts

* revert changes

* revert logo.png

* Resolve Conflicts

* DOC-2234 Update new logo in developer.delphix.com

* logo chnages

* DOC-2234 Update new logo in developer.delphix.com

* new favicon

* incorporated review comments

* DLPX-81195 develop version of vSDK needs to be bumped up to 4.0.4 for testing to use latest vSDK code

* DLPX-81195 develop version of vSDK needs to be bumped up to 4.0.4 for testing to use latest vSDK code

* Changes suggested by Aleks

* CP-8174 VSDK Changes to support source sizing decorators

* reverted dvp version related changes

* reverted extra comma

* update engine API version

* Fixed Formatting Issues

* Fixed Formatting Issues

* Fixed Unit Tests

* Fixed Unit Tests

* Bumping up dvp-api, vsdk

* uppdate formatting

* Revert "CP-8293 Update version to 4.0.5.dev0 for virtualization-sdk develop branch before updating github actions (delphix#442)" (delphix#443)

This reverts commit 222517e.

* CP-8293 Update version to 4.0.5.dev0 for virtualization-sdk develop branch before updating github actions (delphix#444)

* __hash__ is needed in python 3

* DLPX-79760 SnapshotDefinitionDataPaths object is not hashable since py2-3 transition

* DOC-2234 Update new logo in developer.delphix.com

* Resolved COnflicts

* revert logo chnages

* revert logo chnages

* Resolve Conflicts

* revert changes

* revert logo.png

* Resolve Conflicts

* DOC-2234 Update new logo in developer.delphix.com

* logo chnages

* DOC-2234 Update new logo in developer.delphix.com

* new favicon

* incorporated review comments

* DLPX-81195 develop version of vSDK needs to be bumped up to 4.0.4 for testing to use latest vSDK code

* DLPX-81195 develop version of vSDK needs to be bumped up to 4.0.4 for testing to use latest vSDK code

* Changes suggested by Aleks

* CP-8174 VSDK Changes to support source sizing decorators

* reverted dvp version related changes

* reverted extra comma

* update engine API version

* Fixed Formatting Issues

* Fixed Formatting Issues

* Fixed Unit Tests

* Fixed Unit Tests

* Bumping up dvp-api, vsdk

* uppdate formatting

* for rerun the failed runs

* bumpversion support dev bumping

* revert bumpversion support dev bumping

* bump up version from dev0 to dev1

* bump up version from dev0 to dev1

* virtualization-sdk master branch will always refer dlpx-appgate stage/release

* virtualization-sdk master branch will always refer dlpx-appgate stage/release

* virtualization-sdk master branch will always refer dlpx-appgate stage/release

* virtualization-sdk master branch will always refer dlpx-appgate stage/release

* virtualization-sdk master branch will always refer dlpx-appgate stage/release

* Fixed Issue: Lint common - Python38

Co-authored-by: Sourabh Jain <45626610+SumoSourabh@users.noreply.github.com>
Co-authored-by: Sourabh Jain <sourabh.jain@delphix.com>
Co-authored-by: Terraform User <terraform@delphix.com>
# Conflicts:
#	.bumpversion.cfg
#	common/setup.py
#	common/src/main/python/dlpx/virtualization/common/VERSION
#	dvp/src/main/python/dlpx/virtualization/VERSION
#	libs/setup.py
#	libs/src/main/python/dlpx/virtualization/libs/VERSION
#	platform/setup.py
#	platform/src/main/python/dlpx/virtualization/platform/VERSION
#	tools/src/main/python/dlpx/virtualization/_internal/VERSION
#	tools/src/main/python/dlpx/virtualization/_internal/settings.cfg
#	tools/src/test/python/dlpx/virtualization/_internal/conftest.py
#	tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py
CP-8806 Sync virtualization-sdk develop and master for 4.0.5 release
CP-9804 Raise a review to merge all changes from develop branch to master branch after 12.0 code freeze
CP-10488 Jython Removal documentation changes (delphix#527)

* CP-10488 Jython Removal documentation changes

* CP-10488 Jython Removal documentation changes

* CP-10488 Jython Removal documentation changes
SumoSourabh and others added 13 commits November 13, 2024 17:19
CP-11887 Merge Python 3.11 changes to master from develop branch
…lphix#561)

* Configure Mend for GitHub.com (delphix#543)

* Add .whitesource configuration file

* Configure Mend for GitHub.com

---------

Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
Co-authored-by: Shibasish Nandi <119420781+ShibasishDelphix@users.noreply.github.com>

* CP-12279 Documentation for ZFS record size change (delphix#554)

* CP-12230 DVP Record size validation changes for setting ZFS record size (delphix#556)

* CP-12230 DVP Record size validation changes for setting ZFS record size

* CP-12367 Record size validation - Bump DVP version (delphix#558)

* CP-12377  Record size validation - DVP version documentation (delphix#560)

Record size validation - DVP version documentation

---------

Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
Co-authored-by: Shibasish Nandi <119420781+ShibasishDelphix@users.noreply.github.com>
# Conflicts:
#	common/src/main/python/dlpx/virtualization/common/VERSION
#	docs/docs/References/Version_Compatibility.md
#	docs/docs/Release_Notes/.pages
#	docs/mkdocs.yml
#	dvp/src/main/python/dlpx/virtualization/VERSION
#	libs/src/main/python/dlpx/virtualization/libs/VERSION
#	platform/src/main/python/dlpx/virtualization/platform/VERSION
#	tools/src/main/python/dlpx/virtualization/_internal/VERSION
#	tools/src/main/python/dlpx/virtualization/_internal/validation_schemas/plugin_schema.json
#	tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py
…elphix#657)

* Configure Mend for GitHub.com (delphix#543)

* Add .whitesource configuration file

* Configure Mend for GitHub.com

---------

Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
Co-authored-by: Shibasish Nandi <119420781+ShibasishDelphix@users.noreply.github.com>

* CP-12279 Documentation for ZFS record size change (delphix#554)

* CP-12230 DVP Record size validation changes for setting ZFS record size (delphix#556)

* CP-12230 DVP Record size validation changes for setting ZFS record size

* CP-12367 Record size validation - Bump DVP version (delphix#558)

* CP-12377  Record size validation - DVP version documentation (delphix#560)

Record size validation - DVP version documentation

* DLPXDOC-3433 Typo in instructions for virtualization sdk docs (delphix#563)

* DLPX-95497 Update virtulaization-sdk python packages (delphix#568)

PR URL: delphix#568

* CP-13116 Update the dvp version to 5.1.0 (delphix#626)

* CP-13116 Update the dvp version to 5.1.0

* CP-13115 Downgrade engine API version (delphix#629)

* CP-13115 Downgrade engine API version

* CP-13110 Add support for virtualToPhysicalDefinition in DVP code (delphix#630)

* CP-13110 Add support for virtualToPhysicalDefinition in DVP code

* Resolving comments from review.

* CP-13117 Update documentation on the dvp side for vsdk V2P (delphix#633)

* CP-13117 Update documentation on the dvp side for vsdk V2P

* CP-13117 Update documentation on the dvp side for vsdk V2P

* Updated workflow images and addressed review comments

* Updated Breaking changes and html ref for images

---------

Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
Co-authored-by: Shibasish Nandi <119420781+ShibasishDelphix@users.noreply.github.com>
Co-authored-by: Rakshanda Bhat <111853524+rakshandabhat@users.noreply.github.com>
Co-authored-by: vimleshmishra <vimlesh.mishra@delphix.com>
* CP-13245 Add azure vault support in developer.delphix.com

* Updated old links to new ones
….toml (delphix#662)

PR URL: delphix#662
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* CP-13446 Claude md file for vSDK repo

* Updated some additional details from PIT claude md file
# Conflicts:
#	CLAUDE.md
#	common/pyproject.toml
#	libs/pyproject.toml
#	platform/pyproject.toml
@SumoSourabh SumoSourabh changed the title CP-13505 Sync develop and master as dvp-api version updated CP-13509 Sync develop from master as the commit history is broken Jul 13, 2026
@SumoSourabh
SumoSourabh deleted the syncmaster branch July 14, 2026 11:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

6 participants