Re: [cloudstack] branch master updated (1fa4f10 -> fcc87d9)
Just to let you guys know. I talked with INFRA and they protected our
master branches in all of our remote repositories.
I tested and if I try to reset my local branch to a previous commit and
then push it using “push -f”, the push is rejected. However, if I add a new
commit and if I push using “push -f”, the push is accepted. I thought that
the second case would be rejected as well.
So, on the upside, now we have our master branch protected. On the
downside, there is a commit with a dummy file that I created that I am not
able to remove anymore :(
I will see if INFRA can help me to remove that dummy commit (by allowing
one last push -f )
On Mon, Oct 8, 2018 at 10:25 AM Rafael Weingärtner <
rafaelweingart...@gmail.com> wrote:
> I will open a ticket with Infra to check the possibility of protecting
> branches then.
> Thanks for your feedback guys.
>
> On Mon, Oct 8, 2018 at 4:52 AM Rene Moser wrote:
>
>> On 10/08/2018 09:24 AM, Rohit Yadav wrote:
>> > +1 for protecting master and recent 4.{11,10,9...} branches from force
>> pushes.
>>
>> One of those Mondays... ;)
>>
>> +1
>>
>
>
> --
> Rafael Weingärtner
>
--
Rafael Weingärtner
Re: [cloudstack] branch master updated (1fa4f10 -> fcc87d9)
I will open a ticket with Infra to check the possibility of protecting
branches then.
Thanks for your feedback guys.
On Mon, Oct 8, 2018 at 4:52 AM Rene Moser wrote:
> On 10/08/2018 09:24 AM, Rohit Yadav wrote:
> > +1 for protecting master and recent 4.{11,10,9...} branches from force
> pushes.
>
> One of those Mondays... ;)
>
> +1
>
--
Rafael Weingärtner
Re: [cloudstack] branch master updated (1fa4f10 -> fcc87d9)
On 10/08/2018 09:24 AM, Rohit Yadav wrote:
> +1 for protecting master and recent 4.{11,10,9...} branches from force pushes.
One of those Mondays... ;)
+1
Re: [cloudstack] branch master updated (1fa4f10 -> fcc87d9)
+1 for protecting master and recent 4.{11,10,9...} branches from force pushes.
- Rohit
<https://cloudstack.apache.org>
From: Rafael Weingärtner
Sent: Monday, October 8, 2018 3:10:20 AM
To: dev
Subject: Fwd: [cloudstack] branch master updated (1fa4f10 -> fcc87d9)
Hello Folks,
Today I made a huge mistake, I executed a “git push -f” in our remote
repository, which omitted some new commits. It was one of those moments
when you press enter before checking the command that is in the terminal. I
have fixed everything already.
Can we ask infra to protect branches in our remote repository? At least the
master branch.
I apologize for the trouble.
-- Forwarded message -
From:
Date: Sun, Oct 7, 2018 at 6:14 PM
Subject: [cloudstack] branch master updated (1fa4f10 -> fcc87d9)
To: ' comm...@cloudstack.apache.org , <'@
gitbox.apache.org>
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
omit 1fa4f10 Merge remote-tracking branch 'origin/4.11'
omit f430f41 ca: Fixes #2877 mgmt server cert should have all addrs of
default nic (#2879)
omit 5313c04 Merge remote-tracking branch 'origin/4.11'
omit 5db65a6 kvm: Fixes #2868 libvirt resize notify failure (#2878)
omit b6302d4 Merge remote-tracking branch 'origin/4.11'
omit 0c943ab CertUtils: export private key to pem format correctly
(#2875)
omit 769a008 tools: Remove deprecated buildw and wix plugin (#2849)
omit 8c0b9d6 systemvm: baremetal-vr: reduce memory usage (#2866)
omit fe10e68 Merge pull request #2743 from
nuagenetworks/bugfix/marvin_config_drive
omit c2f4b36 packaging: Fixes #2857 don't overwrite agent logrotate
config (#2860)
omit 1f9811d Merge remote-tracking branch 'origin/4.11'
omit d53fc94 CLOUDSTACK-10365: Change the "getXXX" boolean method
names to "isXXX" (#2847)
omit 6f1c555 agent: Fixes #2858 agent LB not working (#2859)
omit cca2505 Handle review comments
omit 9c14059 Merge remote-tracking branch 'origin/4.11'
omit 70dbfa7 systemvm: export $TYPE before patching ssvm/cpvm (#2855)
omit 8da2513 api: Make networkofferingid required in migrateNetwork
(#2852)
omit b728e23 Marvin: Register template
omit 41fcf43 Fix config drive test for Shared Network
omit b0490c5 fixed test_nuage_extra_dhcp test failures due to
refactoring
omit 6041582 CLOUDSTACK-10380: Refactoring of test_configdrive
omit 8d7a1d6 get new vr after NetworkRestartWithCleanup
omit 02e2825 CLOUDSTACK-10380: Fix startvm giving another password
after password reset.
This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.
* -- * -- N refs/heads/master (fcc87d9)
\
O -- O -- O (1fa4f10)
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
agent/src/main/java/com/cloud/agent/Agent.java |2 +-
api/src/main/java/com/cloud/agent/api/to/S3TO.java |2 +-
.../main/java/com/cloud/offering/DiskOffering.java |4 +-
.../java/com/cloud/offering/NetworkOffering.java | 30 +-
.../java/com/cloud/offering/ServiceOffering.java |8 +-
api/src/main/java/com/cloud/storage/GuestOS.java |2 +-
.../com/cloud/template/VirtualMachineTemplate.java |4 +-
api/src/main/java/com/cloud/vm/DiskProfile.java|2 +-
.../command/admin/network/MigrateNetworkCmd.java |5 +-
.../command/user/address/AssociateIPAddrCmd.java |2 +-
.../api/command/user/volume/ResizeVolumeCmd.java |2 +-
client/pom.xml | 254 +++
.../storage/template/S3TemplateDownloader.java |2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java|8 +-
.../engine/orchestration/NetworkOrchestrator.java | 16 +-
.../engine/orchestration/VolumeOrchestrator.java | 10 +-
.../cloud/vm/VirtualMachineManagerImplTest.java|8 +-
.../java/com/cloud/network/dao/NetworkDaoImpl.java |6 +-
.../java/com/cloud/network/vpc/PrivateIpVO.java|2 +-
.../com/cloud/offerings/NetworkOfferingVO.java | 30 +-
.../offerings/dao/NetworkOfferingDaoImpl.java |2 +-
.../java/com/cloud/service/ServiceOfferingVO.java | 12 +-
.../cloud/service/dao/ServiceOfferingDaoImpl.java | 10 +-
.../java/com/cloud/storage/DiskOfferingVO.java |4 +-
.../src/main/java/com/cloud/storage/GuestOSVO.java |2 +-
.../main/java/com/cloud/storage/VMTemplateVO.java |4 +-
.../com/cloud/storage/dao/DiskOfferingDaoImpl.java |2 +-
.../com/cloud/upgrade/dao/Upgrade41110to41120.java | 12 +-
.../main/java/com/cloud/vm/dao/UserVmDaoImpl.j
Fwd: [cloudstack] branch master updated (1fa4f10 -> fcc87d9)
Hello Folks, Today I made a huge mistake, I executed a “git push -f” in our remote repository, which omitted some new commits. It was one of those moments when you press enter before checking the command that is in the terminal. I have fixed everything already. Can we ask infra to protect branches in our remote repository? At least the master branch. I apologize for the trouble. -- Forwarded message - From: Date: Sun, Oct 7, 2018 at 6:14 PM Subject: [cloudstack] branch master updated (1fa4f10 -> fcc87d9) To: ' comm...@cloudstack.apache.org , <'@ gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git. omit 1fa4f10 Merge remote-tracking branch 'origin/4.11' omit f430f41 ca: Fixes #2877 mgmt server cert should have all addrs of default nic (#2879) omit 5313c04 Merge remote-tracking branch 'origin/4.11' omit 5db65a6 kvm: Fixes #2868 libvirt resize notify failure (#2878) omit b6302d4 Merge remote-tracking branch 'origin/4.11' omit 0c943ab CertUtils: export private key to pem format correctly (#2875) omit 769a008 tools: Remove deprecated buildw and wix plugin (#2849) omit 8c0b9d6 systemvm: baremetal-vr: reduce memory usage (#2866) omit fe10e68 Merge pull request #2743 from nuagenetworks/bugfix/marvin_config_drive omit c2f4b36 packaging: Fixes #2857 don't overwrite agent logrotate config (#2860) omit 1f9811d Merge remote-tracking branch 'origin/4.11' omit d53fc94 CLOUDSTACK-10365: Change the "getXXX" boolean method names to "isXXX" (#2847) omit 6f1c555 agent: Fixes #2858 agent LB not working (#2859) omit cca2505 Handle review comments omit 9c14059 Merge remote-tracking branch 'origin/4.11' omit 70dbfa7 systemvm: export $TYPE before patching ssvm/cpvm (#2855) omit 8da2513 api: Make networkofferingid required in migrateNetwork (#2852) omit b728e23 Marvin: Register template omit 41fcf43 Fix config drive test for Shared Network omit b0490c5 fixed test_nuage_extra_dhcp test failures due to refactoring omit 6041582 CLOUDSTACK-10380: Refactoring of test_configdrive omit 8d7a1d6 get new vr after NetworkRestartWithCleanup omit 02e2825 CLOUDSTACK-10380: Fix startvm giving another password after password reset. This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/master (fcc87d9) \ O -- O -- O (1fa4f10) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: agent/src/main/java/com/cloud/agent/Agent.java |2 +- api/src/main/java/com/cloud/agent/api/to/S3TO.java |2 +- .../main/java/com/cloud/offering/DiskOffering.java |4 +- .../java/com/cloud/offering/NetworkOffering.java | 30 +- .../java/com/cloud/offering/ServiceOffering.java |8 +- api/src/main/java/com/cloud/storage/GuestOS.java |2 +- .../com/cloud/template/VirtualMachineTemplate.java |4 +- api/src/main/java/com/cloud/vm/DiskProfile.java|2 +- .../command/admin/network/MigrateNetworkCmd.java |5 +- .../command/user/address/AssociateIPAddrCmd.java |2 +- .../api/command/user/volume/ResizeVolumeCmd.java |2 +- client/pom.xml | 254 +++ .../storage/template/S3TemplateDownloader.java |2 +- .../com/cloud/vm/VirtualMachineManagerImpl.java|8 +- .../engine/orchestration/NetworkOrchestrator.java | 16 +- .../engine/orchestration/VolumeOrchestrator.java | 10 +- .../cloud/vm/VirtualMachineManagerImplTest.java|8 +- .../java/com/cloud/network/dao/NetworkDaoImpl.java |6 +- .../java/com/cloud/network/vpc/PrivateIpVO.java|2 +- .../com/cloud/offerings/NetworkOfferingVO.java | 30 +- .../offerings/dao/NetworkOfferingDaoImpl.java |2 +- .../java/com/cloud/service/ServiceOfferingVO.java | 12 +- .../cloud/service/dao/ServiceOfferingDaoImpl.java | 10 +- .../java/com/cloud/storage/DiskOfferingVO.java |4 +- .../src/main/java/com/cloud/storage/GuestOSVO.java |2 +- .../main/java/com/cloud/storage/VMTemplateVO.java |4 +- .../com/cloud/storage/dao/DiskOfferingDaoImpl.java |2 +- .../com/cloud/upgrade/dao/Upgrade41110to41120.java | 12 +- .../main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 12 +- .../resourcedetail/ResourceDetailsDao.java |2 - .../resourcedetail/ResourceDetailsDaoBase.java | 14 +- .../storage/image/store/TemplateObject.java|8 +- .../storage/image/TemplateEntityImpl.java |4 +- .../cloudstack/quota/vo/ServiceOfferingVO.
