Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove extraneous log directory and add catalina.out log rotation #1537

Merged
merged 1 commit into from
May 13, 2016
Merged

Remove extraneous log directory and add catalina.out log rotation #1537

merged 1 commit into from
May 13, 2016

Conversation

PaulAngus
Copy link
Member

rebased and squashed
replacement for PR: #1087

Remove extraneous log directory (/var/log/cloudstack-management)
and adds catalina.out log rotation

@rohityadavcloud
Copy link
Member

@PaulAngus can you squash the changes, so on the PR we get the changes as one single commit.

You can do:

git checkout master # your master
git remote add upstream https://git-wip-us.apache.org/repos/asf/cloudstack.git # do this if upstream is not already added
git pull --rebase upstream master 
# squash your changes: [1]
git rebase -i HEAD~5
# convert pick to s or squash all commits except for your first commit
# rebase again:
git pull --rebase upstream master
# push -f on your repo/branch
git push origin master -fv

[1] http:https://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html

@rohityadavcloud
Copy link
Member

LGTM

@DaanHoogland
Copy link
Contributor

LGTM, @swill, I am being very formal but can you queue this for integration tests?

@swill
Copy link
Contributor

swill commented May 11, 2016

I am testing now... 👍

@swill
Copy link
Contributor

swill commented May 12, 2016

CI RESULTS

Tests Run: 85
  Skipped: 0
   Failed: 1
   Errors: 0
 Duration: 6h 07m 12s

Summary of the problem(s):

FAIL: Test redundant router internals
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/data/git/cs1/cloudstack/test/integration/smoke/test_routers_network_ops.py", line 290, in test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true
    "Attempt to retrieve google.com index page should be successful!"
AssertionError: Attempt to retrieve google.com index page should be successful!
----------------------------------------------------------------------
Additional details in: /tmp/MarvinLogs/test_network_RIXF85/results.txt

Associated Uploads

/tmp/MarvinLogs/DeployDataCenter__May_11_2016_18_25_27_MFQRAL:

/tmp/MarvinLogs/test_network_RIXF85:

/tmp/MarvinLogs/test_vpc_routers_SQ90BE:

Uploads will be available until 2016-07-12 02:00:00 +0200 CEST

Comment created by upr comment.

@swill
Copy link
Contributor

swill commented May 12, 2016

This one is ready other than Jenkins. @PaulAngus, can you please either force push the PR or close and reopen it so it kicks off Jenkins so we can get this PR all green. It is ready to merge otherwise...

@PaulAngus
Copy link
Member Author

Jenkins has run successfully @swill

@swill
Copy link
Contributor

swill commented May 12, 2016

@PaulAngus I just pushed a fix for the Travis problems you experienced. Can you please re-push this PR so we can try to get it all green so we can get it merged. Thanks again for the support...

@PaulAngus
Copy link
Member Author

Hurrah!!
passed both this time @swill

@swill
Copy link
Contributor

swill commented May 13, 2016

Thank you for your patience sir. 👍 I will get this merged...

@PaulAngus
Copy link
Member Author

Thanks Will.

Kind regards,

Paul Angus

Regards

Paul Angus
VP Technology
www.shapeblue.com
From: Will Stevens [mailto:[email protected]]
Sent: 13 May 2016 16:38
To: apache/cloudstack [email protected]
Cc: Paul Angus [email protected]; State change [email protected]
Subject: Re: [apache/cloudstack] Remove extraneous log directory and add catalina.out log rotation (#1537)

Thank you for your patience sir. 👍 I will get this merged...


You are receiving this because you modified the open/close state.
Reply to this email directly or view it on GitHubhttps://github.com//pull/1537#issuecomment-219079650

@asfgit asfgit merged commit 11e3582 into apache:master May 13, 2016
asfgit pushed a commit that referenced this pull request May 13, 2016
Remove extraneous log directory and add catalina.out log rotationrebased and squashed
replacement for PR: #1087

Remove extraneous log directory (/var/log/cloudstack-management)
and adds catalina.out log rotation

* pr/1537:
  Remove extraneous log directory and add catalina.out log rotation

Signed-off-by: Will Stevens <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants